Load g-i bindings from builddir during build-time testing
authorSimon McVittie <smcv@debian.org>
Thu, 31 Mar 2016 08:02:23 +0000 (09:02 +0100)
committerColin Walters (automation) <walters+githubbot@verbum.org>
Thu, 31 Mar 2016 14:22:06 +0000 (14:22 +0000)
Previously, the build-time tests would only pass if the g-i bindings to
OSTree were already installed, with a reasonably similar version.

Signed-off-by: Simon McVittie <smcv@debian.org>
Closes: #232
Approved by: cgwalters

Makefile-tests.am

index c92b0be188d6b9ce6f8981f2f0e35eab3ce01d53..4241ddb65b12924614c06601a4a84ad91ed14328 100644 (file)
@@ -25,7 +25,10 @@ include $(top_srcdir)/buildutil/glib-tap.mk
 TESTS_ENVIRONMENT += OT_TESTS_DEBUG=1 \
        SRCDIR=$$(cd $(top_srcdir) && pwd) \
        BUILDDIR=$$(cd $(top_builddir) && pwd) \
-       PATH=$$(cd $(top_builddir) && pwd):$${PATH}
+       GI_TYPELIB_PATH=$$(cd $(top_builddir) && pwd) \
+       LD_LIBRARY_PATH=$$(cd $(top_builddir)/.libs && pwd) \
+       PATH=$$(cd $(top_builddir) && pwd):$${PATH} \
+       $(NULL)
 
 uninstalled_test_scripts = tests/test-abi.sh